From: popcornmix <popcornmix@gmail.com>
Date: Fri, 9 Feb 2018 12:44:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
X-Git-Tag: archive/raspbian/4.9.80-2+rpi1~6^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a2f34d45809d8685bca1e91989e35746499ac400;p=linux-4.9.git

Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
---

a2f34d45809d8685bca1e91989e35746499ac400
diff --cc drivers/gpu/drm/vc4/vc4_v3d.c
index 0b8ac3c0c48a,ce7c21d250cf..5b1d4f8e0432
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@@ -314,13 -171,11 +314,16 @@@ static int vc4_v3d_runtime_resume(struc
  {
  	struct vc4_v3d *v3d = dev_get_drvdata(dev);
  	struct vc4_dev *vc4 = v3d->vc4;
 +	int ret;
 +
 +	ret = vc4_allocate_bin_bo(vc4->dev);
 +	if (ret)
 +		return ret;
  
  	vc4_v3d_init_hw(vc4->dev);
+ 
+ 	/* We disabled the IRQ as part of vc4_irq_uninstall in suspend. */
+ 	enable_irq(vc4->dev->irq);
  	vc4_irq_postinstall(vc4->dev);
  
  	return 0;